styleproperties: Remove color set function

Now that we do resolvage with the style context directly, this is no
longer needed.

diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 77e3a12ac91a1ba1021bb5428daf0e3601015e16..81ab4e4fc4b1490107beaba592aa45a71dfba46c 100644 (file)
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -988,9 +988,6 @@ build_properties (GtkStyleContext *context,
     }
 
   style_data->store = gtk_style_properties_new ();
-  _gtk_style_properties_set_color_lookup_func (style_data->store,
-                                               gtk_style_context_color_lookup_func,
-                                               context);
   _gtk_css_lookup_resolve (lookup, context, style_data->store);
   _gtk_css_lookup_free (lookup);
 }

diff --git a/gtk/gtkstyleproperties.c b/gtk/gtkstyleproperties.c
index 46d537412a3bce2ed3a8f8a715b0de8a08383cef..981c9cd30ef3ada9fe19368c499f1e1231e78ba9 100644 (file)
--- a/gtk/gtkstyleproperties.c
+++ b/gtk/gtkstyleproperties.c
@@ -79,8 +79,6 @@ struct _GtkStylePropertiesPrivate
 {
   GHashTable *color_map;
   GHashTable *properties;
-  GtkSymbolicColorLookupFunc color_lookup_func;
-  gpointer color_lookup_data;
 };
 
 static void gtk_style_properties_provider_init         (GtkStyleProviderIface            *iface);
@@ -367,23 +365,6 @@ gtk_style_properties_new (void)
   return g_object_new (GTK_TYPE_STYLE_PROPERTIES, NULL);
 }
 
-void
-_gtk_style_properties_set_color_lookup_func (GtkStyleProperties         *props,
-                                             GtkSymbolicColorLookupFunc  func,
-                                             gpointer                    data)
-{
-  GtkStylePropertiesPrivate *priv;
-
-  g_return_if_fail (GTK_IS_STYLE_PROPERTIES (props));
-  g_return_if_fail (func != NULL);
-
-  priv = props->priv;
-  g_return_if_fail (priv->color_map == NULL);
-
-  priv->color_lookup_func = func;
-  priv->color_lookup_data = data;
-}
-
 /**
  * gtk_style_properties_map_color:
  * @props: a #GtkStyleProperties
@@ -407,7 +388,6 @@ gtk_style_properties_map_color (GtkStyleProperties *props,
   g_return_if_fail (color != NULL);
 
   priv = props->priv;
-  g_return_if_fail (priv->color_lookup_func == NULL);
 
   if (G_UNLIKELY (!priv->color_map))
     priv->color_map = g_hash_table_new_full (g_str_hash,
@@ -443,9 +423,6 @@ gtk_style_properties_lookup_color (GtkStyleProperties *props,
 
   priv = props->priv;
 
-  if (priv->color_lookup_func)
-    return priv->color_lookup_func (priv->color_lookup_data, name);
-
   if (!priv->color_map)
     return NULL;
 

diff --git a/gtk/gtkstylepropertiesprivate.h b/gtk/gtkstylepropertiesprivate.h
index 526559cdcc7f3aae86ececdf13f47566deaad9fa..20abb788d3a32eb1fd3940e6aa375651e40be34d 100644 (file)
--- a/gtk/gtkstylepropertiesprivate.h
+++ b/gtk/gtkstylepropertiesprivate.h
@@ -27,10 +27,6 @@
 
 G_BEGIN_DECLS
 
-void           _gtk_style_properties_set_color_lookup_func    (GtkStyleProperties      *props,
-                                                               GtkSymbolicColorLookupFunc func,
-                                                               gpointer                 data);
-
 const GValue * _gtk_style_properties_peek_property            (GtkStyleProperties      *props,
                                                                GtkCssStyleProperty     *property,
                                                                GtkStateFlags            state);